From efb36f51ba1b5510a87bedef9858f47fb01d91b7 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Oct 2014 08:46:07 -0700 Subject: [PATCH] Update deps with fail => panic Also fix a few test's assertion messages --- Cargo.lock | 28 ++++++++++++++-------------- tests/test_cargo_bench.rs | 2 +- tests/test_cargo_compile.rs | 4 ++-- tests/test_cargo_test.rs | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d4115e62..23e5cac16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,7 @@ dependencies = [ [[package]] name = "curl" version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#1098e4dd3b89b168b412dfeaba033e41796ea794" +source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#64a0f26393e8b30eeda3cbcc71c4d3c864c950ee" dependencies = [ "curl-sys 0.0.1 (git+https://github.com/alexcrichton/curl-rust?ref=bundle)", "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config)", @@ -29,27 +29,27 @@ dependencies = [ [[package]] name = "curl-sys" version = "0.0.1" -source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#1098e4dd3b89b168b412dfeaba033e41796ea794" +source = "git+https://github.com/alexcrichton/curl-rust?ref=bundle#64a0f26393e8b30eeda3cbcc71c4d3c864c950ee" [[package]] name = "docopt" version = "0.6.5" -source = "git+https://github.com/docopt/docopt.rs#1c9a63e0362848570f7c503f8891770ebf2d1eab" +source = "git+https://github.com/docopt/docopt.rs#6db6dc0177ea739be9b90f18ab87a674413797a1" [[package]] name = "encoding" version = "0.1.0" -source = "git+https://github.com/lifthrasiir/rust-encoding#dd6183298e20b038fcd1cc4ab91405b3c72e49db" +source = "git+https://github.com/lifthrasiir/rust-encoding#6daaad9f4c0fcde4525821032686090d6426c462" [[package]] name = "flate2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/flate2-rs#68971ae77a523c7ec3f19b4bcd195f76291ea390" +source = "git+https://github.com/alexcrichton/flate2-rs#f74a1f632c09e4f241ecb638e331c2cec4e955e0" [[package]] name = "git2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#7d7fba10893590793ae88c8fc6ab2aeffcb8f10b" +source = "git+https://github.com/alexcrichton/git2-rs#fc308a305068392b07999b7c47122244b151cdec" dependencies = [ "libgit2 0.0.1 (git+https://github.com/alexcrichton/git2-rs)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -58,17 +58,17 @@ dependencies = [ [[package]] name = "glob" version = "0.0.1" -source = "git+https://github.com/rust-lang/glob#469a6bc1a0fc289ab220170e691cffbc01dcf1e6" +source = "git+https://github.com/rust-lang/glob#a469534627dec112d371f5acb95a561ea8940e69" [[package]] name = "hamcrest" version = "0.1.0" -source = "git+https://github.com/carllerche/hamcrest-rust.git#7d46e76514ac606530dfb0e93270fffcf64ca76d" +source = "git+https://github.com/carllerche/hamcrest-rust.git#998036d000095f72c8bc86f2c412f6432f7ccc3b" [[package]] name = "libgit2" version = "0.0.1" -source = "git+https://github.com/alexcrichton/git2-rs#7d7fba10893590793ae88c8fc6ab2aeffcb8f10b" +source = "git+https://github.com/alexcrichton/git2-rs#fc308a305068392b07999b7c47122244b151cdec" dependencies = [ "libssh2-static-sys 0.0.1 (git+https://github.com/alexcrichton/libssh2-static-sys)", "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config)", @@ -83,7 +83,7 @@ source = "git+https://github.com/alexcrichton/libssh2-static-sys#80e71a3021618eb [[package]] name = "link-config" version = "0.0.1" -source = "git+https://github.com/alexcrichton/link-config#0202cc8aa74a7b0bdbaef4eef368d0bc80f63691" +source = "git+https://github.com/alexcrichton/link-config#ed9fffa15fc41e8f09e92c7756feead1b0cbb01d" [[package]] name = "openssl-static-sys" @@ -100,22 +100,22 @@ dependencies = [ [[package]] name = "semver" version = "0.1.0" -source = "git+https://github.com/rust-lang/semver#0eee1b33e90a62ed03a123b94c8e06cdbaf5b662" +source = "git+https://github.com/rust-lang/semver#fdaec35ff5db609f53119f1e455fdd8830edc790" [[package]] name = "tar" version = "0.0.1" -source = "git+https://github.com/alexcrichton/tar-rs#c477f1ca1b6dde36ebf1f4a739033fe485895722" +source = "git+https://github.com/alexcrichton/tar-rs#fced2e3833ed2776d9975ffc6fb3204528944faa" [[package]] name = "toml" version = "0.1.0" -source = "git+https://github.com/alexcrichton/toml-rs#8a3ba4c65cfa22a3d924293a1fb3a70bfac5e66c" +source = "git+https://github.com/alexcrichton/toml-rs#35804927ef76cc5f24b04f2af25919c488a0992c" [[package]] name = "url" version = "0.1.0" -source = "git+https://github.com/servo/rust-url#7f1991d847fb8cf8648def2ff121bae90b89131f" +source = "git+https://github.com/servo/rust-url#9142b86a812ac5bc886f76235585557d8e002246" dependencies = [ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding)", ] diff --git a/tests/test_cargo_bench.rs b/tests/test_cargo_bench.rs index e6efc9e62..5fec4ec07 100644 --- a/tests/test_cargo_bench.rs +++ b/tests/test_cargo_bench.rs @@ -181,7 +181,7 @@ running 1 test test bench_hello ... ", COMPILING, p.url(), RUNNING)) .with_stderr(format!("\ -task '
' failed at 'assertion failed: \ +task '
' panicked at 'assertion failed: \ `(left == right) && (right == left)` (left: \ `hello`, right: `nope`)', src{sep}foo.rs:13 ", sep = path::SEP)) diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs index 9b8d74ed0..cfadb1f66 100644 --- a/tests/test_cargo_compile.rs +++ b/tests/test_cargo_compile.rs @@ -654,7 +654,7 @@ test!(custom_build_failure { Failed to run custom build command for `foo v0.5.0 ({dir}) Process didn't exit successfully: `{}` (status=101)\n\ --- stderr\n\ -task '
' failed at 'nope', {filename}:2\n\ +task '
' panicked at 'nope', {filename}:2\n\ \n\ ", build.bin("foo").display(), filename = format!("src{}foo.rs", path::SEP), dir = p.url()))); @@ -717,7 +717,7 @@ test!(custom_second_build_failure { Failed to run custom build command for `foo v0.5.0 ({dir}) Process didn't exit successfully: `{}` (status=101)\n\ --- stderr\n\ -task '
' failed at 'nope', {filename}:2\n\ +task '
' panicked at 'nope', {filename}:2\n\ \n\ ", build2.bin("bar").display(), filename = format!("src{}bar.rs", path::SEP), dir = p.url()))); diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs index c4cb668bd..dd8bfe9d2 100644 --- a/tests/test_cargo_test.rs +++ b/tests/test_cargo_test.rs @@ -135,7 +135,7 @@ test test_hello ... FAILED failures: ---- test_hello stdout ---- -task 'test_hello' failed at 'assertion failed: \ +task 'test_hello' panicked at 'assertion failed: \ `(left == right) && (right == left)` (left: \ `hello`, right: `nope`)', src{sep}foo.rs:12 @@ -150,7 +150,7 @@ test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured COMPILING, p.url(), RUNNING, sep = path::SEP)) .with_stderr(format!("\ -task '
' failed at 'Some tests failed', [..] +task '
' panicked at 'Some tests failed', [..] ")) .with_status(101)); }) -- 2.30.2